From 84949659a438699b4e18cf56007049310a468403 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Sun, 15 Apr 2007 15:41:48 +0000 Subject: [PATCH] - removed ancient patches - added a patch to install ocamlbuild as the other legacy binaries --- debian/patches/00list | 25 +++++------ debian/patches/install_ocamlbuild.dpatch | 25 +++++++++++ debian/patches/pr_o.dpatch | 20 --------- debian/patches/versioned_libdir.dpatch.in | 55 ----------------------- 4 files changed, 36 insertions(+), 89 deletions(-) create mode 100755 debian/patches/install_ocamlbuild.dpatch delete mode 100644 debian/patches/pr_o.dpatch delete mode 100755 debian/patches/versioned_libdir.dpatch.in diff --git a/debian/patches/00list b/debian/patches/00list index 88c66d8d..66679a4c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,14 +1,11 @@ -#versioned_libdir -objinfo -dumpobj -man-ocamlmklib -#kbsd-gnu -alpha_ld_no-relax -call_ld_with_proper_flags -#pr_o -no_rpath -stdlib_man_section -install_scripts_config -ocaml-interp_manpage - - +objinfo.dpatch +dumpobj.dpatch +man-ocamlmklib.dpatch +#kbsd-gnu.dpatch +alpha_ld_no-relax.dpatch +call_ld_with_proper_flags.dpatch +no_rpath.dpatch +stdlib_man_section.dpatch +install_scripts_config.dpatch +ocaml-interp_manpage.dpatch +install_ocamlbuild.dpatch diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch new file mode 100755 index 00000000..d646857f --- /dev/null +++ b/debian/patches/install_ocamlbuild.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## foo.dpatch by Stefano Zacchiroli +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Install ocamlbuild uniformly with other ocaml binaries: bytecode version +## DP: with no extension, native version (if any) with .opt extension, avoid +## DP: installing the "best" binary + +@DPATCH@ +diff -urNad ocaml-3.10.0~beta~/build/partial-install.sh ocaml-3.10.0~beta/build/partial-install.sh +--- ocaml-3.10.0~beta~/build/partial-install.sh 2007-03-06 10:48:38.000000000 +0100 ++++ ocaml-3.10.0~beta/build/partial-install.sh 2007-04-15 17:38:04.000000000 +0200 +@@ -139,9 +139,9 @@ + + echo "Installing ocamlbuild..." + +-installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE +-installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE +-installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE ++installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE ++installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE ++#installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE + + installlibdir \ + ocamlbuild/ocamlbuildlib.$A ocamlbuild/ocamlbuildlib.p.$A \ diff --git a/debian/patches/pr_o.dpatch b/debian/patches/pr_o.dpatch deleted file mode 100644 index 06fffdea..00000000 --- a/debian/patches/pr_o.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## pr_o.dpatch by Julien Cristau -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Upstream fix for camlp4 (PR#3948, debian bug 355651) - -@DPATCH@ -diff -urNad ocaml-3.09.1~/camlp4/etc/pr_o.ml ocaml-3.09.1/camlp4/etc/pr_o.ml ---- ocaml-3.09.1~/camlp4/etc/pr_o.ml 2006-01-03 18:12:30.000000000 +0000 -+++ ocaml-3.09.1/camlp4/etc/pr_o.ml 2006-03-25 13:42:35.000000000 +0000 -@@ -1408,7 +1408,8 @@ - <:expr< while $_$ do { $list:_$ } >> | <:expr< ($list: _$) >> | - <:expr< let $opt:_$ $list:_$ in $_$ >> | - <:expr< let module $_$ = $_$ in $_$ >> | -- <:expr< new $list:_$ >> | -+ (* Note: `new' is treated differently in pa_o and in pa_r, -+ and should not occur at this level *) - <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e -> - fun curr next dg k -> - [: `S LO "("; `expr e "" [: `HVbox [: `S RO ")"; k :] :] :] diff --git a/debian/patches/versioned_libdir.dpatch.in b/debian/patches/versioned_libdir.dpatch.in deleted file mode 100755 index 2f862674..00000000 --- a/debian/patches/versioned_libdir.dpatch.in +++ /dev/null @@ -1,55 +0,0 @@ -#! /bin/sh -e -## versioned_libdir.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Add the version as path element for OCAML_LIBDIR. - -if [ $# -ne 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 -@DPATCH@ -diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_batch ---- ocaml.orig/camlp4/config/configure_batch.orig 2003-09-30 18:11:57.000000000 +0200 -+++ ocaml/camlp4/config/configure_batch 2003-09-30 18:12:51.000000000 +0200 -@@ -103,13 +103,13 @@ - *) echo "BINDIR=$bindir" >> Makefile.cnf;; - esac - case "$libdir" in -- "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf -- libdir="$prefix/lib/camlp4";; -+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/#OcamlABI#/camlp4' >> Makefile.cnf -+ libdir="$prefix/lib/ocaml/#OcamlABI#/camlp4";; - *) echo "LIBDIR=$libdir" >> Makefile.cnf;; - esac - case "$mandir" in -- "") echo 'MANDIR=$(PREFIX)/man/man1' >> Makefile.cnf -- mandir="$prefix/man/man1";; -+ "") echo 'MANDIR=$(PREFIX)/share/man/man1' >> Makefile.cnf -+ mandir="$prefix/share/man/man1";; - *) echo "MANDIR=$mandir" >> Makefile.cnf;; - esac - -diff -ur ocaml.orig/configure ocaml/configure ---- ocaml.orig/configure 2003-09-30 18:09:47.000000000 +0200 -+++ ocaml/configure 2003-09-30 18:10:12.000000000 +0200 -@@ -146,8 +146,8 @@ - *) echo "BINDIR=$bindir" >> Makefile;; - esac - case "$libdir" in -- "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile -- libdir="$prefix/lib/ocaml";; -+ "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/#OcamlABI#' >> Makefile -+ libdir="$prefix/lib/ocaml/#OcamlABI#";; - *) echo "LIBDIR=$libdir" >> Makefile;; - esac - echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile -- 2.30.2